From 483d105bf731adb0807fca88a2ad171559210971 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Thu, 16 Mar 2006 18:14:06 +0000
Subject: [PATCH] Curt Archer restores TPO track handler.

---
 readme.xml                  |  29 +++++++++++++++++++++++++++--
 reference/track/sample1.gpx |   1 +
 reference/track/sample2.tpo | Bin 5933 -> 5933 bytes
 testo                       |  11 +++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/readme.xml b/readme.xml
index 10b7c1063..7994b74d9 100644
--- a/readme.xml
+++ b/readme.xml
@@ -1530,9 +1530,9 @@ the same name (not including the extension) as the .ov2 file.
 	<subtitle>National Geographic Topo Waypoint format.</subtitle>
       </sectioninfo>
       <title>TPG</title>
-      <para>National Geographic Topo! Waypoint Format.  This filter
+      <para>National Geographic Topo! Waypoint and Route Format.  This module
 reads and writes .TPG files created by various editions of NG Topo!
-This filter will *not* work with the newer combined .TPO files.
+Reading/writing of route data is not supported yet. This filter will *not* work with the newer combined .TPO files.
 Contributed by Alex Mottram.</para>
       <para>The option 'datum="datum name"' can be used to override
 the default of NAD27 ("N. America 1927 mean") which is correct for the
@@ -1540,6 +1540,31 @@ continental U.S. Points in Hawaii should use "Old
 Hawaiian_mean"</para>
       <para>Contributed by Alex Mottram.</para>
     </section>
+   <section id="tpo">
+       <sectioninfo>
+	  <subtitle>National Geographic Topo! Track Format.</subtitle>
+	</sectioninfo>
+	<title>TPO</title>
+	<para>This module reads and writes
+    .TPO files created by various editions of NG Topo! version 2.7.7 or
+    earlier. This format will *not* work with the newer .TPO files
+    (version 3.0 and later) that have the TPG data combined into them.</para>
+	<para>When writing TPO files, note that every TOPO! state edition 
+	employs a slightly different data format, so you will need to 
+	specify which state edition to generate output for.  The current 
+	supported states are CA, NY, NJ, MA, CT, RI, NH, VT, ME. It's 
+	fairly easy to add support for additional states. Instructions are 
+	in the source code.</para>
+      <para>	Additional Options: </para>
+        <para>
+	  <option>dumpheader</option> (0/1)  Display the file header bytes (useful when adding support for a new state)
+	</para>
+        <para>
+	  <option>state</option>  State map format to write, default=CA.
+	</para>
+	<para>Contributed by Steve Chamberlin.</para>
+
+   </section>
 	<section id="unicsv">
 	<sectioninfo>
 	  <subtitle>Universal csv with field structure in first line.</subtitle>
diff --git a/reference/track/sample1.gpx b/reference/track/sample1.gpx
index 8d0e55fba..1fa265665 100644
--- a/reference/track/sample1.gpx
+++ b/reference/track/sample1.gpx
@@ -6,6 +6,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
 <time>1970-01-01T00:00:00Z</time>
+<bounds minlat="33.753026015" minlon ="-122.443458941" maxlat="41.447125389" maxlon="-116.669656846" />
 <trk>
   <name>Track 1</name>
 <trkseg>
diff --git a/reference/track/sample2.tpo b/reference/track/sample2.tpo
index d0b0e1a4bae48b37951a2cd41216fe6c3d1102ae..ab7556c2884125ae23f8d3a84375b30706545a33 100644
GIT binary patch
delta 626
zcmZ{h%Ps?97=~vfA|Z{nd+1&)I+1V@7Q%v-MwO^DGmdenW0A17Z6dL<asf7V0oFEL
zLp_ho9~S({)9;<;``>xLZ<_gL{-M^9jP$-1KT4zVTe($z&h^Jp8l~-|ozx>wn{(8P
z(!e2Fb|8gKSb;g1ff7u>WTvO6WvIYBEW-wPZ(W`6qtP~OWm@xnH~?Q(htrG;>J{8%
zTvN~B1VZ02TEg=s+P=R?G;4rOnx8{3)WpdRVjzPV(y(H12XG>%S<6s6;eXg~FPlr!
zMZ^NQo+`L1S2hi<&y^OzmCEmx+V9;O=(CiuO7$g%GpND$z#&Av`^|U|Kh>$ctcl;&
qZ>DhwIg2)||2e4}3Fh}NW5Z8_-G#ebPgmi6V5m{)>3jU_jB{TE=^DoX

delta 627
zcmXX@TT4`76def>A*pBA5Ae<RNN})+9z<qLyGS9S5eVuy>Uf>z9CdWGQPRds&P;-e
z58?$u5rP!;L5O-#hyqh65f!{(Yt+|ios$O^``h1H-`abxJ(oR~z2HkV_OqhXX%(ew
z-h%tfx9;9^I!uR|G?GTI!}?Mj$>ab_@LsUu0H33uFA!!qx><ovR>D-?#3!idQ+Qa4
zO1?ss{(0zumtNG;2OnF}!VYnJ5#%tsIH5R$pur^xeMS#gg*BZwB)*A0ep8_>VH*+t
zzz~07n7bI|AH;Zsk37Q|FAyg&!UP6+C0vVlDL!wIP@X_kd7OXs=E6pt=gLoo6Bscb
zi*P961AO4V#D1&Lp2T)E^-oRw9q-ggAHUj-^>E#8^etEH#zXw1NtV#T1z}#8RX#0e
zrtB%LNjo_yj4K~gjOqUf+8L1>{RRRIqm>~v%brFWXrLc;Y?5^is9~*atU<MGuHtLO
zm%1yFrN!bEieIR=kKvd7Z?uL0%V20VZCXQ+&s4BT&AQdNTLZXmV4eTpg;{1DTs9#r
zF$*Dy1-0jP6*DDfN;DurzxLbAM=I=6%-7vR@gB$prv!6s98APgzvSJ{jgDGhdanCq
PD<$H|$Xq;2bKdy}rEf>o

diff --git a/testo b/testo
index 169c6245f..6b04de348 100755
--- a/testo
+++ b/testo
@@ -200,6 +200,17 @@ ${PNAME} -i tpg -f ${TMPDIR}/geo.tpg -o mxf -F ${TMPDIR}/tpg.mxf
 ${PNAME} -i tpg -f reference/tpg.tpg -o mxf -F ${TMPDIR}/topo.mxf
 compare ${TMPDIR}/tpg.mxf ${TMPDIR}/topo.mxf
 
+# TPO (NG Topo!) file format
+# This is hard to test as the datum conversions create minute
+# inconsistencies in the coordinates. We have four reference files:
+# sample1.tpo, sample1.gpx, sample2.gpx, and sample2.tpo.  These are
+# used to check the conversion to/from TPO format.
+rm -f ${TMPDIR}/sample1.gpx ${TMPDIR}/sample2.tpo
+${PNAME} -t -i tpo -f reference/track/sample1.tpo -o gpx -F ${TMPDIR}/sample1.gpx
+compare ${TMPDIR}/sample1.gpx reference/track/sample1.gpx
+${PNAME} -t -i gpx -f reference/track/sample2.gpx -o tpo -F ${TMPDIR}/sample2.tpo
+bincompare ${TMPDIR}/sample2.tpo reference/track/sample2.tpo
+
 # OZI (OziExplorer 1.1) file format
 rm -f ${TMPDIR}/oz.wpt ${TMPDIR}/ozi.wpt
 ${PNAME} -i ozi -f reference/ozi.wpt -o ozi -F ${TMPDIR}/oz.wpt
-- 
2.30.2